Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org

diff --cc doc/man/ChangeLog
index 8a2a90f7895305337d7eb694f12a34687f754367,1898160220bf8ebc0ba5ca79fe76f8dd22b3d47b..8b550dc4417209238e26617a923f022be22137fa
--- 1/doc/man/ChangeLog
--- 2/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@@ -1,6 -1,10 +1,10 @@@
 -2013-04-10  Petr Hracek  <phracek@redhat.com>  (tiny change)
++2013-04-20  Petr Hracek  <phracek@redhat.com>  (tiny change)
+ 
+       * emacs.1: Add some more command-line options.  (Bug#14165)
+ 
 -2013-03-11  Glenn Morris  <rgm@gnu.org>
 +2012-12-02  Kevin Ryde  <user42@zip.com.au>
  
 -      * Version 24.3 released.
 +      * etags.1: Mention effect of --declarations in Lisp.
  
  2012-06-03  Glenn Morris  <rgm@gnu.org>
  

diff --cc doc/man/emacs.1
Simple merge